From 0680eec01927469e1985f486d77ffdbdb8747981 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Fri, 11 Mar 2005 00:30:35 +0000 Subject: [PATCH] bitkeeper revision 1.1159.258.45 (4230e6ab4xRdK4pchNbpgZE-preulA) Fix one more pud merge incident. Signed-off-by: Christian Limpach --- linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c index e8d48949d3..8a0df417ed 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c @@ -369,7 +369,7 @@ int __direct_remap_area_pages(struct mm_struct *mm, pud = pud_alloc(mm, dir, address); if (!pud) break; - pmd = pmd_alloc(mm, dir, address); + pmd = pmd_alloc(mm, pud, address); if (!pmd) break; error = 0; -- 2.30.2